Skip to content

nx-libs, x2goclient and x2goserver#27432

Merged
Johnnynator merged 3 commits into
void-linux:masterfrom
eoli3n:x2goclient
May 10, 2021
Merged

nx-libs, x2goclient and x2goserver#27432
Johnnynator merged 3 commits into
void-linux:masterfrom
eoli3n:x2goclient

Conversation

@eoli3n

@eoli3n eoli3n commented Dec 25, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Closes #9779 and #2091

From https://github.com/renatoaguiar/void-packages/tree/x2goclient
Ping @renatoaguiar, I sent you a mail, if you want to be the maintainer, just ask.

nx-libs

The current version is ok to be merged.

x2goclient

  • Changed license
  • Updated maintainer
  • Updated to latest version
  • Disable cross compilation until nx-libs update ?

x2goserver

  • Create template
  • Patch /usr/sbin references
  • Init script for $PREFIX/bin/x2gocleansessions
  • Write runit service
  • Disable cross compilation until nx-libs update ?

Note

@yopito

yopito commented Dec 25, 2020

Copy link
Copy Markdown
Contributor

hello, I've retrieved an old WIP branch of mine: https://github.com/yopito/void-packages/tree/WIP.x2go
Might help you to package it.
Feel free to reuse its content.

@ericonr ericonr added the new-package This PR adds a new package label Dec 25, 2020
@eoli3n eoli3n mentioned this pull request Dec 26, 2020
Open
3 tasks
@eoli3n
eoli3n force-pushed the x2goclient branch 13 times, most recently from cee6455 to 1911160 Compare December 28, 2020 19:17
ahesford pushed a commit to ahesford/void-packages that referenced this pull request Dec 28, 2020
@eoli3n @ahesford
New package: x2goclient-4.1.2.2
181ac2f 
Closes: void-linux#27432 [via git-merge-pr]
@ahesford

ahesford commented Dec 28, 2020

Copy link
Copy Markdown
Member

Cf. ahesford@2653816

@eoli3n
eoli3n force-pushed the x2goclient branch 2 times, most recently from 3722e5d to 6d068c7 Compare December 28, 2020 22:18
@eoli3n eoli3n changed the title x2goclient and nx-libs nx-libs, x2goclient and x2goserver Dec 28, 2020
Johnnynator
Johnnynator reviewed Jan 26, 2021
View reviewed changes
Comment thread srcpkgs/x2goclient/template Outdated
@Johnnynator

Johnnynator commented Jan 26, 2021

Copy link
Copy Markdown
Member

It also needs libtirpc-devel
nx-libs fails to compile with

utils.c: In function 'LockServer':
utils.c:382:35: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
  382 |   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
      |                                   ^
utils.c:382:10: note: 'sprintf' output between 12 and 13 bytes into a destination of size 12
  382 |   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CC strlcat.c
rpcauth.c:47:10: fatal error: rpc/rpc.h: No such file or directory
   47 | #include <rpc/rpc.h>
      |          ^~~~~~~~~~~
compilation terminated.
failed command: gcc -c -g -O3 -fno-strict-aliasing -std=c99 -Wall -Wpedantic -Wpointer-arith -Wshadow -Wundef -I. -I../include -I../../../exports/include/nx-X11 -I../../../include/extensions -I../../../programs/Xserver/Xext -I../../../programs/Xserver/render -I../../../lib/Xau -I../../../../nxcomp -I/usr/include/pixman-1 -I../../.. -I../../../exports/include -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DXCSECURITY -DXF86BIGFONT -DDPMSExtension -DRENDER -DRANDR -DPANORAMIX -DXFIXES -DDAMAGE -DCOMPOSITE -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXvExtension -DXFree86Server -DXvMCExtension -DBUILDDEBUG -DXResExtension -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DXORG_VERSION_CURRENT=(((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) -D_XSERVER64 -DNDEBUG -DHAVE_SETITIMER=1 -DHAS_XFONT2 -DFUNCPROTO=15 -DNARROWPROTO -DUNIXCONN -DTCPCONN -DHAS_STICKY_DIR_BIT -DHAS_FCHOWN -DIPv6 -DHASXDMAUTH -DSECURE_RPC -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF -DCLIENTIDS -DBUILDERADDR="xorg@lists.freedesktop.org" -DFAIL_HARD -DXTRANS_SEND_FDS=0 -DNX_TRANS_SOCKET -DNX_TRANS_AUTH -DNX_TRANS_FOPEN -DNX_TRANS_SLEEP -DNX_TRANS_EXIT -DNX_TRANS_WAKEUP -DNXAGENT_SERVER rpcauth.c
make[7]: *** [Makefile:531: rpcauth.o] Error 1
make[7]: *** Waiting for unfinished jobs....

@eoli3n
eoli3n force-pushed the x2goclient branch 2 times, most recently from dfb75ec to 070372a Compare January 26, 2021 14:16
@eoli3n

eoli3n commented Jan 26, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

It also needs libtirpc-devel
nx-libs fails to compile with

@Johnnynator As you said on IRC, you found this : https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec#L437
Then, I don't know how to force this with the actual template.

@ahesford Would you take a look
How to force IMAKE arguments ?

@eoli3n

eoli3n commented May 9, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

I need some help to finish this, ping @ahesford @Johnnynator

@Johnnynator

Johnnynator commented May 10, 2021

Copy link
Copy Markdown
Member

Changes I pushed ontop: x2goclient moved to qt5 and fixed cross issues

--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -3,10 +3,14 @@ pkgname=x2goclient
 version=4.1.2.2
 revision=1
 build_style=gnu-makefile
+build_helper=qmake
+make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
 make_build_target="build_client build_man"
+make_install_args="$make_build_args"
 make_install_target="install_client install_man"
-hostmakedepends="pkg-config qt-devel-tools"
-makedepends="qt5-devel libldap-devel libssh-devel libXpm-devel cups-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel
+ libssh-devel libXpm-devel cups-devel"
 depends="nx-libs"
 short_desc="Graphical Qt5 client for X2Go"
 maintainer="eoli3n <jkirsz@gmail.com>"

and nx-libs: updated to 3.5.99.26 and added usage of libtirpc

--- a/srcpkgs/nx-libs/template
+++ b/srcpkgs/nx-libs/template
@@ -1,21 +1,21 @@
 # Template file for 'nx-libs'
 pkgname=nx-libs
-version=3.5.99.24
+version=3.5.99.26
 revision=1
 build_style=gnu-configure
-make_build_args="CONFIGURE=echo"
+make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
 make_install_args="PREFIX=/usr"
 hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
 makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
  libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel
  libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
- libXpm-devel font-util"
+ libtirpc-devel libXpm-devel font-util xkbcomp"
 short_desc="NX X11 protocol compression libraries"
 maintainer="eoli3n <jkirsz@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ArcticaProject/nx-libs"
 distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
-checksum=e1ea9ae7621ca955e9650caacd2260eed26aae2be4eff2b44c2b1aaecd69f9eb
+checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
 python_version=3
 nocross="imake attempts to run target executables on host"

@Johnnynator
Johnnynator merged commit c113269 into void-linux:master May 10, 2021
@eoli3n

eoli3n commented May 10, 2021

Copy link
Copy Markdown
Contributor Author

Thanks @Johnnynator

@eoli3n

eoli3n commented May 10, 2021

Copy link
Copy Markdown
Contributor Author

What about x2goserver ? No need to create a runit service in the package ?

@Anachron

Anachron commented May 10, 2021

Copy link
Copy Markdown
Contributor

Wohoo! Thanks for packaging this.
I've closed my issue manually because it seems not to have been auto closed on merge.

@cultab

cultab commented May 10, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

running x2godbadmin returns this.

Can't locate Try/Tiny.pm in @INC (you may need to install the Try::Tiny module) (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl) at /usr/local/sbin/x2godbadmin line 29.
BEGIN failed--compilation aborted at /usr/local/sbin/x2godbadmin line 29.

I think the perl-Try-Tiny package needs to be added in the dependencies, correct me if I'm wrong or if this is not the place to share this.

@ericonr

ericonr commented May 10, 2021

Copy link
Copy Markdown
Member

@cultab please open a separate issue about this or a PR to fix it :)

@eoli3n
eoli3n deleted the x2goclient branch May 10, 2021 18:49
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Aug 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@Johnnynator Johnnynator Johnnynator left review comments

Assignees

No one assigned

Labels

new-package This PR adds a new package

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Package Request: x2goclient

7 participants

@eoli3n @yopito @ahesford @Johnnynator @Anachron @cultab @ericonr